merge
authorEmmanuel Ackaouy <ack@xensource.com>
Wed, 20 Sep 2006 17:33:26 +0000 (18:33 +0100)
committerEmmanuel Ackaouy <ack@xensource.com>
Wed, 20 Sep 2006 17:33:26 +0000 (18:33 +0100)

Trivial merge